Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

external: make global sort common.Range unencoded (#51900) #51969

Merged
merged 12 commits into from
Mar 21, 2024
Merged

external: make global sort common.Range unencoded (#51900) #51969

merged 12 commits into from
Mar 21, 2024

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #51900

What problem does this PR solve?

Issue Number: close #51910

Problem Summary:

Previously, start key / end key of common.Range is NOT encoded for local engine, but encoded for external engine. This will cause external engine generates a wrong range, and no data will be ingest to TiKV:

tidb/br/pkg/lightning/backend/local/local.go

Lines 1010 to 1014 in bdc64e5

start, end := keyRange.Start, keyRange.End
pairStart, pairEnd, err := data.GetFirstAndLastKey(start, end)
if err != nil {
return nil, err
}

tidb/br/pkg/lightning/backend/external/engine.go

Lines 513 to 527 in bdc64e5

func (m *MemoryIngestData) GetFirstAndLastKey(lowerBound, upperBound []byte) ([]byte, []byte, error) {
firstKeyIdx, lastKeyIdx := m.firstAndLastKeyIndex(lowerBound, upperBound)
if firstKeyIdx < 0 || firstKeyIdx > lastKeyIdx {
return nil, nil, nil
}
firstKey, err := m.keyAdapter.Decode(nil, m.keys[firstKeyIdx])
if err != nil {
return nil, nil, err
}
lastKey, err := m.keyAdapter.Decode(nil, m.keys[lastKeyIdx])
if err != nil {
return nil, nil, err
}
return firstKey, lastKey, nil
}

If keyRange.Start is encoded, m.firstAndLastKeyIndex will encode it again. Thus, these keys are encoded twice.

What changed and how does it work?

After this PR, we will follow the conventions as below:

For both local and external engines,

  • the data on s3 is encoded
  • the statistical data on s3 is encoded
  • all common.Range are not encoded.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.0 labels Mar 21, 2024
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2024
Merged
13 tasks
Benjamin2037
Benjamin2037 approved these changes Mar 21, 2024
View reviewed changes
Copy link
Collaborator

@Benjamin2037 Benjamin2037 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Mar 21, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 21, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, YuJuncen

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 21, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Mar 21, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-21 05:11:48.920372059 +0000 UTC m=+1526335.942618448: ☑️ agreed by Benjamin2037.
  • 2024-03-21 07:09:10.372535361 +0000 UTC m=+1533377.394781749: ☑️ agreed by YuJuncen.

@tangenta
Copy link
Contributor

/retest

@codecov Codecov
Copy link

codecov bot commented Mar 21, 2024 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-8.0@bca83e6). Click here to learn what that means.
The diff coverage is 28.2608%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-8.0     #51969   +/-   ##
================================================
  Coverage               ?   70.7053%           
================================================
  Files                  ?       1477           
  Lines                  ?     438961           
  Branches               ?          0           
================================================
  Hits                   ?     310369           
  Misses                 ?     109095           
  Partials               ?      19497
Flag Coverage Δ
unit 70.4476% <28.2608%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9957% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 45.7993% <0.0000%> (?)

@ti-chi-bot ti-chi-bot bot merged commit 2452443 into pingcap:release-8.0 Mar 21, 2024
33 of 41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

Assignees

@tangenta tangenta

Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @tangenta @Benjamin2037 @YuJuncen @lance6716